[rustdoc] Do not take `doc(cfg())` into account when filtering doctests by GuillaumeGomez · Pull Request #159014 · rust-lang/rust

GuillaumeGomez · 2026-07-09T13:15:04Z

Because it was using the extract_cfg_from_attrs common function, it was taking into account the doc(cfg()) attributes the same as if they were a cfg.

I didn't mark this PR as "fix" because I didn't handle the case of the doctest not being marked as ignored because I'm not sure if we should revisit the fact that we ignore these doctests or if we should just mark them as ignored (because of target_feature(enable = "...")).

Setting @fmease as reviewer as they are likely the only one with context about this issue. 😆

r? @fmease

GuillaumeGomez · 2026-07-09T14:27:11Z

And now it fails because we (doc) inlined some functions. Fixing that then. :)

GuillaumeGomez · 2026-07-09T20:28:45Z

Fixed CI \o/

GuillaumeGomez · 2026-07-15T13:11:12Z

Reverted changes I made to extract_cfg_from_attrs and instead only look for the target_feature attributes.

GuillaumeGomez · 2026-07-15T13:51:00Z

Ah, new stuff gets added.

rustbot · 2026-07-15T14:51:01Z

stdarch is developed in its own repository. If possible, consider making this change to rust-lang/stdarch instead.

cc @Amanieu, @folkertdev, @sayantn

GuillaumeGomez · 2026-07-16T10:34:55Z

Seems like CI is happy now.

GuillaumeGomez · 2026-07-24T12:04:10Z

Setting a new reviewer as fmease seems busy.

r? @Urgau

rust-bors · 2026-08-04T15:31:54Z

This pull request was unapproved.

This PR was contained in a rollup (#160507), which was unapproved.

View changes since this unapproval

GuillaumeGomez · 2026-08-04T21:32:07Z

@bors try jobs=x86_64-msvc-1,pr-check-2,aarch64-apple

[rustdoc] Do not take `doc(cfg())` into account when filtering doctests try-job: x86_64-msvc-1 try-job: pr-check-2 try-job: aarch64-apple

rust-bors · 2026-08-04T23:39:23Z

💔 Test for b8642e4 failed: CI. Failed jobs:

try - aarch64-apple (web logs, enhanced plaintext logs)
try - x86_64-msvc-1 (web logs, enhanced plaintext logs)

rustbot · 2026-08-05T15:09:31Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

GuillaumeGomez · 2026-08-05T15:10:57Z

@bors try jobs=x86_64-msvc-1,pr-check-2,aarch64-apple

[rustdoc] Do not take `doc(cfg())` into account when filtering doctests try-job: x86_64-msvc-1 try-job: pr-check-2 try-job: aarch64-apple

rust-bors · 2026-08-05T18:13:14Z

☀️ Try build successful (CI)
Build commit: 01c604d (01c604df897ad1942f50161832861a3eeb1f01fd)
Base parent: 22950ab (22950ab9e29e11620a10905f027f141ea126966e)

GuillaumeGomez · 2026-08-05T18:48:21Z

@bors r=Urgau rollup=iffy

rust-bors · 2026-08-05T18:48:24Z

📌 Commit 49dae43 has been approved by Urgau

It is now in the queue for this repository.

…uwer Rollup of 12 pull requests Successful merges: - #159014 ([rustdoc] Do not take `doc(cfg())` into account when filtering doctests) - #159029 (rustc_llvm: Emit module summaries when using -Clto=fat) - #160574 (Update rustc-perf submodule) - #154585 (treat no_mangle_generic_items as hard error instead of lint warning) - #159473 (Fix, simplify, and document doc meta finalize mode) - #157489 (Add CoerceShared field-wise reborrow WF checks) - #160532 (Add Enzyme bugfix to support rust+llvm23) - #160545 (Reorder the methods in `#[rustc_must_implement_one_of]`) - #160558 (Revert "codegen_ssa: no dbginfo for scalable vec local w/ `-O0`") - #160566 (Re-enable bool indexing assembly test for LLVM 23) - #160569 (Remove `OnDuplicate::Custom`) - #160576 ([rustdoc] Create output file after we checked that the standalone markdown file is valid)

@fmease

Rollup merge of #159014 - GuillaumeGomez:doc-cfg-filter-doctest, r=Urgau [rustdoc] Do not take `doc(cfg())` into account when filtering doctests Part of #147033. Because it was using the `extract_cfg_from_attrs` common function, it was taking into account the `doc(cfg())` attributes the same as if they were a `cfg`. I didn't mark this PR as "fix" because I didn't handle the case of the doctest not being marked as ignored because I'm not sure if we should revisit the fact that we ignore these doctests or if we should just mark them as ignored (because of `target_feature(enable = "...")`). Setting @fmease as reviewer as they are likely the only one with context about this issue. 😆 r? @fmease

…uwer Rollup of 12 pull requests Successful merges: - rust-lang/rust#159014 ([rustdoc] Do not take `doc(cfg())` into account when filtering doctests) - rust-lang/rust#159029 (rustc_llvm: Emit module summaries when using -Clto=fat) - rust-lang/rust#160574 (Update rustc-perf submodule) - rust-lang/rust#154585 (treat no_mangle_generic_items as hard error instead of lint warning) - rust-lang/rust#159473 (Fix, simplify, and document doc meta finalize mode) - rust-lang/rust#157489 (Add CoerceShared field-wise reborrow WF checks) - rust-lang/rust#160532 (Add Enzyme bugfix to support rust+llvm23) - rust-lang/rust#160545 (Reorder the methods in `#[rustc_must_implement_one_of]`) - rust-lang/rust#160558 (Revert "codegen_ssa: no dbginfo for scalable vec local w/ `-O0`") - rust-lang/rust#160566 (Re-enable bool indexing assembly test for LLVM 23) - rust-lang/rust#160569 (Remove `OnDuplicate::Custom`) - rust-lang/rust#160576 ([rustdoc] Create output file after we checked that the standalone markdown file is valid)

rustbot assigned fmease Jul 9, 2026

This comment has been minimized.

Sign in to view

rustbot added O-wasi Operating system: Wasi, Webassembly System Interface O-wasm Target: WASM (WebAssembly), http://webassembly.org/ O-windows Operating system: Windows labels Jul 9, 2026

This comment has been minimized.

Sign in to view

GuillaumeGomez force-pushed the doc-cfg-filter-doctest branch from f5059c8 to 062cfea Compare July 9, 2026 14:58

This comment has been minimized.

Sign in to view

GuillaumeGomez force-pushed the doc-cfg-filter-doctest branch from 062cfea to 1d5692c Compare July 9, 2026 15:43

fmease reviewed Jul 14, 2026

View reviewed changes

Comment thread src/librustdoc/clean/cfg.rs

GuillaumeGomez force-pushed the doc-cfg-filter-doctest branch from 1d5692c to a0bf3c9 Compare July 15, 2026 13:10

This comment has been minimized.

Sign in to view

GuillaumeGomez force-pushed the doc-cfg-filter-doctest branch from a0bf3c9 to 59a72c3 Compare July 15, 2026 14:50

GuillaumeGomez force-pushed the doc-cfg-filter-doctest branch from 59a72c3 to 885af7e Compare July 15, 2026 15:53

This comment has been minimized.

Sign in to view

GuillaumeGomez force-pushed the doc-cfg-filter-doctest branch from 885af7e to 21e8051 Compare July 15, 2026 20:35

rustbot assigned Urgau and unassigned fmease Jul 24, 2026

rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 4, 2026

This comment has been minimized.

Sign in to view

rust-bors Bot pushed a commit that referenced this pull request Aug 4, 2026

Auto merge of #159014 - GuillaumeGomez:doc-cfg-filter-doctest, r=<try>

b8642e4

[rustdoc] Do not take `doc(cfg())` into account when filtering doctests try-job: x86_64-msvc-1 try-job: pr-check-2 try-job: aarch64-apple

This comment has been minimized.

Sign in to view

GuillaumeGomez added 6 commits August 5, 2026 17:07

Do not take doc(cfg()) into account when filtering doctests

f1a459a

Add regression test for doc(cfg()) doctest (non-)filtering

132b76e

Ignore std doctests if not run on the right OS

338d346

Fix new windows doc code example

f1ea79c

Add missing cfg_attr on doc tests in stdlib os module

d6132d0

Fix cfg_attr for library/std/src/os/unix/net/ancillary.rs

49dae43

GuillaumeGomez force-pushed the doc-cfg-filter-doctest branch from e79eaf3 to 49dae43 Compare August 5, 2026 15:09

This comment has been minimized.

Sign in to view

rust-bors Bot pushed a commit that referenced this pull request Aug 5, 2026

Auto merge of #159014 - GuillaumeGomez:doc-cfg-filter-doctest, r=<try>

01c604d

[rustdoc] Do not take `doc(cfg())` into account when filtering doctests try-job: x86_64-msvc-1 try-job: pr-check-2 try-job: aarch64-apple

rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 5, 2026

JonathanBrouwer mentioned this pull request Aug 5, 2026

Rollup of 12 pull requests #160586

Merged

rust-bors Bot merged commit a5fb91e into rust-lang:main Aug 6, 2026
14 checks passed

rustbot added this to the 1.99.0 milestone Aug 6, 2026

Uh oh!

Uh oh!

Conversation

GuillaumeGomez commented Jul 9, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

GuillaumeGomez commented Jul 9, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

GuillaumeGomez commented Jul 9, 2026

Uh oh!

Uh oh!

This comment has been minimized.

GuillaumeGomez commented Jul 15, 2026

Uh oh!

This comment has been minimized.

GuillaumeGomez commented Jul 15, 2026

Uh oh!

rustbot commented Jul 15, 2026

Uh oh!

This comment has been minimized.

GuillaumeGomez commented Jul 16, 2026

Uh oh!

GuillaumeGomez commented Jul 24, 2026

Uh oh!

rust-bors Bot commented Aug 4, 2026

Uh oh!

GuillaumeGomez commented Aug 4, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors Bot commented Aug 4, 2026

Uh oh!

rustbot commented Aug 5, 2026

Uh oh!

GuillaumeGomez commented Aug 5, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Aug 5, 2026

Uh oh!

GuillaumeGomez commented Aug 5, 2026

Uh oh!

rust-bors Bot commented Aug 5, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

GuillaumeGomez commented Jul 9, 2026 •

edited by rustbot

Loading